If we already have a pointer grab active with a grab cursor set, destroy

2003-12-07  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
	have a pointer grab active with a grab cursor set, destroy that
	cursor to avoid a GDI resource leak. (#128410, Tim Evans)

diff --git a/ChangeLog b/ChangeLog
index 4bc57a6e4fff82f06ac895bfaf66b20a62f11d0a..4c520c1ece2c181f4c10fdca853dea62aa2b479a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
+       have a pointer grab active with a grab cursor set, destroy that
+       cursor to avoid a GDI resource leak. (#128410, Tim Evans)
+
 2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
 
         * configure.in: Added Thai (th) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4bc57a6e4fff82f06ac895bfaf66b20a62f11d0a..4c520c1ece2c181f4c10fdca853dea62aa2b479a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2003-12-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
+       have a pointer grab active with a grab cursor set, destroy that
+       cursor to avoid a GDI resource leak. (#128410, Tim Evans)
+
 2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
 
         * configure.in: Added Thai (th) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4bc57a6e4fff82f06ac895bfaf66b20a62f11d0a..4c520c1ece2c181f4c10fdca853dea62aa2b479a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2003-12-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
+       have a pointer grab active with a grab cursor set, destroy that
+       cursor to avoid a GDI resource leak. (#128410, Tim Evans)
+
 2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
 
         * configure.in: Added Thai (th) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4bc57a6e4fff82f06ac895bfaf66b20a62f11d0a..4c520c1ece2c181f4c10fdca853dea62aa2b479a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2003-12-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
+       have a pointer grab active with a grab cursor set, destroy that
+       cursor to avoid a GDI resource leak. (#128410, Tim Evans)
+
 2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
 
         * configure.in: Added Thai (th) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4bc57a6e4fff82f06ac895bfaf66b20a62f11d0a..4c520c1ece2c181f4c10fdca853dea62aa2b479a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2003-12-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already
+       have a pointer grab active with a grab cursor set, destroy that
+       cursor to avoid a GDI resource leak. (#128410, Tim Evans)
+
 2003-12-05  Paisa Seeluangsawat  <paisa@users.sf.net>
 
         * configure.in: Added Thai (th) to ALL_LINGUAS.

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index df6673d6277895e3f0815feb9ad0338cd92663c3..76ccb20e197050c2bb04fe579e5c229953b5a033 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -549,6 +549,14 @@ gdk_pointer_grab (GdkWindow    *window,
   if (return_val == GDK_GRAB_SUCCESS)
     {
       p_grab_window = window;
+
+      if (p_grab_cursor != NULL)
+       {
+         if (GetCursor () == p_grab_cursor)
+           SetCursor (NULL);
+         DestroyCursor (p_grab_cursor);
+       }
+
       p_grab_cursor = hcursor;
 
       if (p_grab_cursor != NULL)